bitkeeper revision 1.1389.1.35 (42778db85KaZKAK6OU1HQjCb_K-YKw)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk

diff --cc .rootkeys
Simple merge

diff --cc linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
index f3490857f03b8bd869e7b2ed67ad63b2256c327c,0fad9a4f330374e77e1dfef08881702cdf55779d..ed3882c426a56408cdde66eb658f46c2d0f54e93
--- 1/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
--- 2/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
@@@ -662,16 -662,22 +662,26 @@@ config REGPAR
        generate incorrect output with certain kernel constructs when
        -mregparm=3 is used.
  
 -
  config X86_LOCAL_APIC
        bool
 -      depends on (X86_VISWS || SMP) && !X86_VOYAGER
 -      default n
 +      depends on !SMP && X86_UP_APIC
 +      default y
 +
 +config X86_IO_APIC
 +      bool
 +      depends on !SMP && X86_UP_IOAPIC
 +      default y
  
+ config HOTPLUG_CPU
+       bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
+       depends on SMP && HOTPLUG && EXPERIMENTAL
+       ---help---
+         Say Y here to experiment with turning CPUs off and on.  CPUs
+         can be controlled through /sys/devices/system/cpu.
+ 
+         Say N.
+ 
+ 
  if XEN_PHYSDEV_ACCESS
  
  menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"